Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Read replica database config not detected [DHIS2-15963] [2.39] #15826

Merged
merged 2 commits into from
Dec 4, 2023
Merged

fix: Read replica database config not detected [DHIS2-15963] [2.39] #15826

merged 2 commits into from
Dec 4, 2023

Conversation

larshelge
Copy link
Member

@larshelge larshelge commented Dec 4, 2023 •
edited
Loading

Read replica databases configured in dhis.conf were no longer picked up. The cause was a refactor were DefaultReadOnlyDataSourceManager went from being a Spring managed bean to a regular class. This class had an init method managed by Spring InitializingBean which no longer would be called. Refactors ReadOnlyDataSourceManager so that the init method is called in the main constructor.

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Dec 4, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

warning The version of Java (11.0.21) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@codecov Codecov
Copy link

codecov bot commented Dec 4, 2023

Codecov Report

Merging #15826 (15cf164) into 2.39 (886690f) will increase coverage by 6.21%.
Report is 122 commits behind head on 2.39.
The diff coverage is 68.42%.

Additional details and impacted files 
@@             Coverage Diff              @@
##               2.39   #15826      +/-   ##
============================================
+ Coverage     58.58%   64.79%   +6.21%     
- Complexity    25817    28699    +2882     
============================================
  Files          3207     3212       +5     
  Lines        121397   121821     +424     
  Branches      14158    14221      +63     
============================================
+ Hits          71118    78938    +7820     
+ Misses        44340    36394    -7946     
- Partials       5939     6489     +550
Flag Coverage Δ
integration 48.59% <34.38%> (+<0.01%) ⬆️
integration-h2 34.00% <28.52%> (?)
unit 29.54% <38.02%> (+0.16%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...main/java/org/hisp/dhis/appmanager/AppManager.java 100.00% <ø> (ø)
...src/main/java/org/hisp/dhis/category/Category.java 65.21% <100.00%> (ø)
...ava/org/hisp/dhis/common/BaseAnalyticalObject.java 70.95% <100.00%> (+5.81%) ⬆️
...a/org/hisp/dhis/common/BaseIdentifiableObject.java 80.20% <100.00%> (+1.37%) ⬆️
...s-api/src/main/java/org/hisp/dhis/common/Grid.java 0.00% <ø> (ø)
.../src/main/java/org/hisp/dhis/common/QueryItem.java 68.66% <100.00%> (ø)
...isp/dhis/dataapproval/DataApprovalPermissions.java 91.66% <ø> (+22.43%) ⬆️
...rc/main/java/org/hisp/dhis/feedback/ErrorCode.java 100.00% <100.00%> (ø)
...src/main/java/org/hisp/dhis/period/PeriodType.java 85.45% <100.00%> (+1.91%) ⬆️
...rg/hisp/dhis/resourcetable/ResourceTableStore.java 100.00% <ø> (+100.00%) ⬆️
... and 91 more

... and 571 files with indirect coverage changes

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 092f1a4...15cf164. Read the comment docs.

@maikelarabori maikelarabori self-requested a review December 4, 2023 11:46
@larshelge larshelge merged commit 6a998dc into 2.39 Dec 4, 2023
12 checks passed
@larshelge larshelge deleted the DHIS2-15963-39 branch December 4, 2023 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maikelarabori maikelarabori maikelarabori approved these changes

@gnespolino gnespolino gnespolino approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@larshelge @gnespolino @maikelarabori